Fix bug #2496 with column counting in presence of display tables.

 src/indent.c (compute_motion): Process display vector front to back
 rather than the other way around.

diff --git a/src/ChangeLog b/src/ChangeLog
index 69f5dd3096cc40ac999873a83443074636c5c802..0f48c7a277f637d31b614388a88796af3fa3269f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-12  Eli Zaretskii  <eliz@gnu.org>
+
+       * indent.c (compute_motion): Process display vector front to back
+       rather than the other way around.  (Bug#2496)
+
 2011-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * fileio.c (Finsert_file_contents): Don't assume beg_offset is 0.

diff --git a/src/indent.c b/src/indent.c
index 6e602d28f60aa06dbbe8e89c998fdd0cb982acf5..bae9ab1b46d1010a45ba0f30d34f2a4204fcd577 100644 (file)
--- a/src/indent.c
+++ b/src/indent.c
@@ -1543,7 +1543,7 @@ compute_motion (EMACS_INT from, EMACS_INT fromvpos, EMACS_INT fromhpos, int did_
              n = 1;
            }
 
-         for (i = n - 1; i >= 0; --i)
+         for (i = 0; i < n; ++i)
            {
              if (VECTORP (charvec))
                {